From f60728dcb0d45e0658fdd70292386470440f18b8 Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Mon, 5 Mar 2001 11:27:20 +0000 Subject: [PATCH] (activate-input-method): If current-input-method-title is set by activating INPUT-METHOD, respect that value. --- lisp/international/mule-cmds.el | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el index ba8ecca8af0..2704bbc0b5d 100644 --- a/lisp/international/mule-cmds.el +++ b/lisp/international/mule-cmds.el @@ -1048,6 +1048,7 @@ If INPUT-METHOD is nil, deactivate any current input method." (let ((slot (assoc input-method input-method-alist))) (if (null slot) (error "Can't activate input method `%s'" input-method)) + (setq current-input-method-title nil) (let ((func (nth 2 slot))) (if (functionp func) (apply (nth 2 slot) input-method (nthcdr 5 slot)) @@ -1057,7 +1058,8 @@ If INPUT-METHOD is nil, deactivate any current input method." (apply (car func) input-method (nthcdr 5 slot))) (error "Can't activate input method `%s'" input-method)))) (setq current-input-method input-method) - (setq current-input-method-title (nth 3 slot)) + (or (stringp current-input-method-title) + (setq current-input-method-title (nth 3 slot))) (unwind-protect (run-hooks 'input-method-activate-hook) (force-mode-line-update))))) -- 2.30.2